Feature: added some more tools