Added InputRouter and test