Added scheduler