Roderik van Heijst

> @0x0aNL Can you please rebase this PR so that we can revive this PR and merge it then ? I have rebased the PR!

Rebased once again and fixed performance in cases where no `Through` models were found.