[Fix] Proper json creation