Add support for STI