Don't introduce null values everywhere