added other record classes, logic to related methods in
TabularGenerator.class and tests