0007: fixed table names
0008: scopes for credentials