Refactor Yar, make the arch more clear for the persistent link