Change supervisor tree. Add consumer control