Initial work to make compatible with ST3