Finished ID mappings and fixed extData calculation.