Some Cin7 users are using the city field as suburb, and address line 2 as building.
As we already use city as the suburb if suburb is empty we could add an option to map address line 2 to building.