Next revision: A more generic tool
Extend
Update to scala-API repo