Added env flag to configuration