Refactor interface lookups for session info

I think this is a better solution. Please review.