added types to output map