Added AddressExtractor