change data processing type to Map.class from String.class

modify class & method of related classes