Use new generic tables infrastructure