Updated CollisionManager