Use map, instead of flatMap and add 'old' ways of handling it