Completion updated to fit contract_groups.