First tentative version of transaction support