Moving from uri_template to addressable for stronger uri template compatability