Added Country field to addresses + Bugfix