Improve doccumentation