Improved Docbook structure