Improve doc export