Dox improvements