Added option for optimized routing