added Combo data-modell stuff;