Merge "Refactor of Intersection class"