Added transactions but batch fetching is not yet working so performance is horrible...