Modified the table columns in the database to make more sense