Add more generic map transformation fns