Changed lookup logic