Adding support for missing commands