Improvements for future iOS integration