Rework CommitHandlers