Added conditional URL inclusion