Improve Address class