Completed iOS 6 support