Beginning of changes to resource deserialization.