Remove need for FieldEmbeddedResource