address parse/resolve methods refactoring