Additional PSTV support enhancements