Added basePath in Location