collections: optimized
travis: fix
Map: add to collection list in code generator
q2: fixed types -> Map