Institute and supervisor commands are now optional