Improve comments
Add mapping for table 3