Now takes the base path as an argument