Added table schema mappings
Added note
Correct class ref to org
Merge mappings
Merge branch 'master' into dev