Refactoring table structure.