Improved doc