Update to return multiples if needed, and a placeholder for validation