Updated for server rests