Fixing the datatypes to support serialization

Change-Id: I471d7170141abcda791a088b454cf2390c2ab23c
Signed-off-by: Kunal Shroff <shroffk@bnl.gov>
Fix the type reference to use multivalued maps

Change-Id: Ica4a0a4844a797a55b45244893b0dcfa52d2e2b0
Signed-off-by: Kunal Shroff <shroffk@bnl.gov>