Added data model classes