Updating for Xcode 6