Update for Xcode DP5. Not done yet