Updates to Rest for ease of developm and validation.