Extra fields

Add additional whitelist fields from issue #2.