Fix for rest subscriptions and minor refactoring