Add support for address rewriting