Added CollisionInfo, CollisionResolver