- Merge the concept of context and state
- Allow for multiple isntances anywhere in the conf
- Introduce up and recurrence in the context