Henrik Reitan #1.4
Updated databaseModel to reflect changes in server