Make the addresses field as map