Added wrench support