Keep entities in single collection and rework collision detection