Added naive  Rx and EventStore support