Refactor schedule group updates [#73573]