Add supervisor and ability to override creds