New version.
Switch to using AutoDoc()