Updated and improved doc