Can now use custom tool type