0007: fixed table names & removed provider