Updated Schedule generator method