Added scheduler and controls manager