Addded more lookups.