More extension helper refactoring