Refactoring and preparation for enhanced data model