Updated simple-router