Start 3.0 refactoring