Add tools and update toucho image