Updated the Variable class