Adding some env persistance.