Re-work relationship/metadata style to enable reverse lookups