Add address Table, refactoring + some comments