Improve grep and add few env variables