More ST2/ST3 support