Updated a couple modifiers
Optimized IsEnumEmpty helper method