Extend data model