Improved documentation handling