Added Variable & VariableType