Improved collision manager