Redesigned structure of Table.java