Add relation stack expose refactor