Removed hardcoded column names