Added rest of Database entity classes