Add more fields + allow nulls (#534)
Merge branch 'master' into production