Added support for scheduled execution