Refactor subscriptions
Plugin 1.3.2
This reverts commit 7ca5328d.
This reverts commit e9e5c1c0. Further investigations towards this issue are needed.
Add subscription support