Server changes

Updated the server to match the database changes