Preparing for rework of commands