Added mapping tables
Changed table organization
case mappings