BATCH-2305

Writer should use a linked hash map, so that order of iteration is defined