Who can take Rangers set pieces next year?

I lost count of the number of goals that came from Diouf's set pieces. I just worry that we will go back to Steven Davis as he was largely disappointing from a dead ball perspective last season.