Refactored Address and Tokenizer