Added svt handler
Refactored