Add support for subscriptions
0.6.0