Fix JSON structure and add more packages