Post-Rebase Changes

Add new modes to enumerator.