Added custom address validator