Added tools and more