Use for comprehension instead of Enum.traverse
Ensure support to 1.0.0