Some polish to the endpoint command