More ContentProvider workarounds