Refactored to use library Address parsing code