updated Model and AbstractModel to simplify ModelValueId