Fixed dependencies on Collidable interface for all entities