Provide additional refactoring