A little "refactoring".
Add REST API tools.