Update to latest toolhandler spec