added builders for new raw format