Refactored by changing some table column names