Add map/fold and more help methods