Refactoring and changed data model.