Changes to Server DB functionality