Refactor: Increase DocumentProperties cohesion