Added support for Viewpoint in Adaptationset