Add urlfinder and comments