added map adapter, marshall unmarshall