Added iOS support
Changed data call to use set methods rather than manually setting data