Working queue! Redesigned CSP, TS, XMLD classes.