Remove basepath requirement