Fixed error with custom shell scripts not being loaded
Added few new env variables