Added manuel json conversion for now