Adding VariableDependencies and VariableContext