Use EndpointResolver methods in CLI, if possible

Refs: #2