ES 3.1 support