Ensure fields and annotations