Added Rx implementation