Improve DOC