Sticking to system supervisor for now