added supervisor support