Use API v2 in connector, part 2