Further work on CommandReceiver