Improved generated ssp templates