Added UAT sandbox support