Modified schedule generator to pass a bit more data to anything that calls it