Reintroduce 2.0 support