Refactor on entries and routers.