Update to use proper supervisor