Feature/external tools