Added dynamic dataset build