Add envdir and enable it's use