SVY-6962 Improved documentation datasources