Update with latest rx + RxGroovy implementation