Changed doc generation mechanism