Added Supervisor components and parts of logic