Re #7 Added component json