Add address validation to TODOs