Refactor tables
Fix size of address