Single use links refactor