Adapted to new Fifo.map() method