add some changes after switching to new Server file (using notORM)