Updated classes to use RecyclerView API