Merged server and database entities and added additional new entities