Reworked Document architecture