Latest updates at the classes and database structure