Freestyle Changes to support Autorun Scheduler