Module helper refactoring