Added some intelligent routing