Added more fields in the table