Added the currently extension + extension helper refactoring