Changes to add echo service and echo proxy service