Major Changes to Lookup Table and Parser