Store addresses with proper alias