added cli env support