Added custom validators/Address class