updated model, added entities