Changed class identification table to be scoped