Added address template table and a reference on the country table