Add support for address labels