Adding support to persistent dirs.
Adding support .env files.