Added safer table ids