Refactoring
Improve resolved address parsing