Changes for resource viewer