Adding tool handler