Changes for new version of server