Why do you need an ``extraFields`` option, the option is not used in this PR ?