Added route optimizations