Updated Link persistence and creation