Added data model class creation