2.x refactoring