Improve study parsing

* Break custom stubs detection