Added schedule support