Resolve "Update the usage of extra_functions" Closes #4 See merge request to-be-continuous/openshift!4