Refactor last changes allowing to pass environment variables to node