Better schema and examples