Re-encrypted to add env_vars