MODIFIED: content provider name
MODIFIED: some queries to use content provider
MODIFIED: all commands to use content provider