Added TODO for field name uniqueness validation