Added some tool and capability