Refactor interface lookups for session info