More work on BaseCommands