Moved URLs to ENV variables