Changing internal structure and adding lookup.