Improve collision manager