Added additional fields to the tables