Object to Map transformer now handles different datatypes