Structured data improvements