Added DescriptorContainer which can be passed to some descriptors to avoid parsing options from text representation
Merged the scene file back for simplicity