Modified CallbackService to use RxJava