Added support for CMD override