Updated Init and Lookup