Added addressSelectionHandler