Update to use actor with supervisor