PDIO-230 Single class import Json for clarity