Doc improvment