reusable mappings
some renamings and doc blocks