Added more data structure (address to contact)