Adding address validation