Switch to use STI