Added tool types, needs config though