Structure for processing commands

1. Minor change, to synchronize to another box.