Fixed issue #4 - localize lookup data