Router functionality improved