Updated server to work with newest changes