Collisions now resolved by type