fixed current server to use new DB objects