Add preliminary STI support (#5)