Add logic for looking up relevant claims