Change DataBuilder base to an extendable class rather than an interface. This allowed us to remove the getData() method from all of the DataBuilder classes