Better handling of 'extra fields' Closes #8