Added entities and enumtypes for database