Supporting fallback to old separate environment variables