Add backward compatible with ST2