Refactored over from RemotrServer