Finish support for everything except parsing unit info