Better support for v11