Refactor

- NS become PG
- Env var added