Add oval support