[#7] update for additional env params