Optimized tools on API and command-line side