add full null data support