Start move to RxJava