ICommandRegistry, some retriever fixes