Version 7 refactoring