Added env variable usage