Moved collision to entity