Refactored Collision related objects