Added environment replace