Refactoring the JSON data sources, storage and parsing