Made enum base more consistent with Registry calls