Better dependency loading

Improved by Niklas.