Add map conversion and output