Add back in .env logic so environment variable are available