Enumeration constraints relaxed
12 files changed