Extending autodocs (2nd try)