Refactor data model contstructor