Follow the re-structuring to handle sub-commands