Added pathset support