Added scheduler working