Updated structure of schedular