Add DBDataGenerator, and subpolicy builder