Interim Commit on System templates