Update to make it work with general url config