table mappings corrected