Adding additional extensions
Modifying URL selection to be a bit more functional
Removed more mutable state in URL retrieval