Changed infrastructure for commanding