Improved documentatio