Fixed RouterEntity protocol and Router implementation