Moved Scalar Variable to its own class