added builder methods for new data format