Refactoring smart extension module