Refactoring
Router core ok