7.0 refactoring