Add iOS6+ support