Add url awareness