Added support for dealing with URL changes..