First commit for entity class