Minor route updates for simpler (seeming) API