Changing default lookup to use the lookup_or_add function