Updated database entities and Forms