Add and enable by default - environment indicator