added generic mapping
commit
commit