Added self-managing