Adding support for Basepath with /