Rework and add environment path