[MODELING] Refactor Modeling environment variables