Updated database
Refactored entity classes