Refactored main address entry