Add fields and config for #6.