Command.completion + Command.handle added