[Chris / Jai] Added single use environments