Updated for Xcode beta 4