Updated to support new 2.2 schema