Model enhacements to allow for bid integration work.