Update the docbuilder with some optimizations