Update to work with ST 2.2.0