updated Address class