Lots of changes to the extraction model.