Renamed and Refactored DBGenerator