Added PathSet support