add support for the addresses field