Added enumeration support. Refactored for null safe operations in type strategies.