Use API v2; update for xcode 6