Added map for analysis property.