New mappings, more docs and tests.