Added tools missing from last commit