Schedule support added