Remove usage of isMatching function
Add BC breaks info