Added Subscriptions and error logging