Replaced any essentially empty DataBuilder's with the base DataBuilder class. Replaced all usage of is_a() with instanceof