Add Dataset and System scaffolds