Split out Variable class