adding support for address specification