Refactor ANT router