EDOC-811 Refactored