Adding the ability to override the base URI