Change data structure for current transaction (related to issue #33)