Backwards compatibility support for v1.2.0