Updated for latest server API changes.