added some tool support