Fixed global enumeration for 0.4 ozone
Refactored global enumeration