Mainly changes to the database