- Add router.currentState
- Pass those extended StateWithParams objects in signals handlers