Added more option to supervisor