Added ContentProvider and others