Improve matching of Request and Response blocks
Catch `Models`