Rework command to be generic.