Add generators, fix bug in map values comparison.