Some path mapper changes