Added structure to the database models