Update to new enum methods