Refactore i-router