Updated component safe rendering