Add proper big transaction handling