add extract and collect tools