updated to use version 2.2.9 of Address Hierarchy