Added support for command, command-builtin, command-language and command-script to be able to run overridden commands