Remove composer
Add addressRegions and addressCountries