Awesome guide right there, I have this problem though, I was trying to use your guide with android architecture components and I had a problem in shifting the FirestoreRecyclerOptions to a repository pattern. Mainly shifting the loading of data from the activity to a repository.