Subscription support + some bugfixes

Subscription support + some bugfixes