TEIIDDES-1917

Addresses issues with refactoring read-only resources