Updated for Xcode Beta 7