Added source urls and highlighting