Adjust map function to cover for struct

object model can use values types actually more often than class.