OPAL-1680: Add variables to view