Rework render hooks