Add compatibility with 2.3.0