Make collision manager handle more cases