Refactoring data model.