Adding ST3 Compatibility