Update JavaDoc, merge Mapping into this one