Tweaked enumerations again