Documentation update
Updated docs after merge