Added modularized STT attribution