Removed cyclic dependency and added closest intersection retrieval