Add members/keys to any list/map type
Support unflattened maps in query services