Added document handler back