Reworked links api