Worked on table mappings