Added support for single layer sub-commands