Modifications due to the removal of the address columns. These have been replaced by one address column that holds the entire address apart from town, zip and country