Update For New Server Gen