Added intersection resolver