Changed type definitions to NS_ENUM
Fixed NSUIntegrer for ordering