Make value() type include enum values