Changes need to be v2.2+ compliant