Refactor standard tables.