Made env variables more generic.