Handler to add address extension as keyword

As described in #12