Add more fields + allow nulls (#534)