Removed a basePath hardcoding