better collection mapping
better Map support
better example
better example
testcase small fix