Changing to use generateDS instead of manually-written classes.