Added missing parts related to iOS