Performance refactor of ContentMetadata model