Added Basic Link support
Added non-titular links