Update lookup tables

See commit message