Oracle rendering improvements