Added Transaction-Handling