Replace callable by Closure and transaction improvements