added prod and sandbox support