Migrated transaction management to 1.6