[DNR] Refactoring split between update and render