Map should be readonly
Better semantics for generating strategy
Merge branch 'master'