Added an EnumModifier, needs some more work an optimizations