Adding better server routes