Updated a bit more for the functionality of the database