Add new fields and add cascade delete