Update to use AutoDoc() and with changes due to recent AutoDoc changes