Rewrote the whole parsing system and added content generators