Adding country code to address attributes
Removing unused address attribute condition