updated schema to use plural table names