variant model refractoring (ModelValue removed)
model dict external, model dict refractoring
variant fixes and refractoring