Updated EMF models and removed Undefined value for VariableType.