Better dsf mapping