schedule handler improvements