Idle behaviour for review

* More generic
* Better configurable