Simplify with Document singleton