[#112587] Changes to adapt the viewer to new entities