[FIX] Add the same mapping to addresses