Fixed the table mapping