Changed ER-Modell.
And sorted sql shit.