Update annotation config and custom persistence handler for StructuredContent to be compatible with collection refactor