Refactored physic component