Fix the address model to map to V2 API.