Better way to get passageId
flater structure