Include defaults directly in metadata