further improvements for CommandManager and Commands