Added some more tools and utils