CGIV-1743 Changes to allow support of resources instead of filenames