Expand CommandController functionality