with additional fields for restructuring