Changed typedef enum to use NS_ENUM macro, so swift will convert them into enum
Fixing build issues