Add an ability to use direct links