Data model refactored.