Updated database layout, added new classes