improve support CommandNode