Moving to new command impl