added support for additional commands