Updated with new environment urls