Added basepath passing (no usage as yet)