Moved out correct_map table to addendum