CORE-296 Changed viewer slightly due to API object variations.