Updates for CTM parser. Still broken..