Rework on Documentation