Updated for xcode beta7