Still working on the database structure creation