Updated documentation according to the wiki