Added Variable* helper classes