Pushing the first changes to add modern the database functionality