Added validation to target fields