Updated server specific code to new API