Improved some code, reallocated job of figuring out token types to the SENNAPipeline