* Switched to abstract tool
* Switch to internal events