Minor change: null fields definition in builder is not allowed anymore