Documents Module rework WIP