Improved Router And Factories