Added Punctuation segment annotator and type system