Add empty data support