CHANGE: Changes in API mapping (+city)