Add proper links