Updated for Xcode6-beta5