ST2 compatibility improved