#4 Updated database schema and part of class diagram