Added support for view types equal to what is supported by storage