Fixed CommandEndpoint functionality