Improved doc structure.