Fixed DocumentGenerator