Lookup buffer added to replace binary search