Integrating look-up file from 507b8307c5