[REFACTOR] TableManager logic changed. In progress...