Add support for STT