Update extract to cater for new teams architecture.
refs openhealthcare/elcid#314