Move constants to enums
Supporting backup cancellation