Add support for two settings and two encodings for batch