Modified database structure, created new entities and services, added a computed field controller