Removed iOS macros and switched to strongly typed enum