HCOLL-81 simplified code by using lookupUsing