Ci 902_1

Refactored code for all fields .