Docs enhanced