Added Generics to the ContentProvider