Back to S&F

- Back to the Store&Forward approach
- Several fixes