Updated and harmonized documentation