Adding extract tools