Improve plugin a bit to accomodate interface changes.
Add the country and city code.