Make data subscriptions and query streams work. Sorry this commit is so huge