Added fallback address parsing