Updated Address class