Adding SP/TS

#146