support of empty datasets added