Added plumbing for tool actions