Refactored fetching of fields data!