Updated to support multple commands for supervisor