quickfix for broken link
Some refactoring of the model setup, connecting models