Added UAT/Sandbox support