Adds better link handling and link attribute