Fix transaction + add WS