Enhance the dynamic doc gen system