Adaptate rest of the code to new server design