Worked on table mapping