Add support for v1.1