Updated for new server version