Changed pf mapping to work in all modes