Add url attribute. Tweaks