enhance cli & Route