F: Add additional fields