Dileep/Yogesh | #2684 | Refactored to use field_code than index