Converted Swift enums to v1.1