Storage links

Depends on #1068.