New Table initialization + refactoring