Framework refactoring