Updated Schedule Builder