Removed old approach for addresses