Extended the database models