Finally got mapping figured out for Batch and BatchEntry