Added tool support