Updated loader, parsing JSON files