Add basePath to allow re-usability