Updated the column naming convention, added the table descriptor sql