Updated with configuration of supervisor