Refactored JSON data fields and made them into a working concern