Add relationship type support to TokenContext