Allow for more flexible extra fields