add RichMap, and also test for it